From 3e3495c2de94747d5ac7860172483392b0871fcf Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Sat, 13 Dec 2025 09:32:27 +0100 Subject: [PATCH] disable-java-in-odk-build-examples-on-zero-vm Gbp-Pq: Name disable-java-in-odk-build-examples-on-zero-vm.diff --- config_host.mk.in | 1 + configure.ac | Bin 589022 -> 589331 bytes odk/Module_odk.mk | 4 ++++ 3 files changed, 5 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index 1f4b6040b27..b7955d9940d 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -379,6 +379,7 @@ export JAVACFLAGS=@JAVACFLAGS@ export JAVAIFLAGS=@JAVAIFLAGS@ export JAVAIFLAGS_FOR_BUILD=@JAVAIFLAGS_FOR_BUILD@ export JAVAINTERPRETER=@JAVAINTERPRETER@ +export JAVA_HAS_ZERO_VM=@JAVA_HAS_ZERO_VM@ export JAVA_HOME=@JAVA_HOME@ export JAVA_HOME_FOR_BUILD=@JAVA_HOME_FOR_BUILD@ export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@ diff --git a/configure.ac b/configure.ac index a008282d5f6df65653274e15a3cf577dde6eb271..890b83dcb3b1032290c65cd4266cd9d029e91610 100644 GIT binary patch delta 210 zcmccjQ+e_q<%Sl<7N!>FEiCOnrhhDCm79KH5i{p>GB<(@tvgq3}I!A&OK$rF;;CkL3aZ{PTX sC7f~cpM#tNUXEdo@g4}nrZ0?U32Be|#R9~vK+Fcj?AxP$akMZ206AAo{{R30 delta 64 zcmbRINBQ1Q<%Sl<7N!>FEiCOnraOsoC{GSBW#4}KCrdcv^q95GzSBQMv#_@J|7HPV Q5X}a}?A!Z)bF?r40Dy5E3IG5A diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 500348a7ea6..9029cb32b98 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -60,10 +60,14 @@ $(eval $(call gb_Module_add_check_targets,odk,\ ifneq ($(filter $(OS),LINUX MACOSX),) $(eval $(call gb_Module_add_subsequentcheck_targets,odk, \ CustomTarget_build-examples \ +)) +ifneq ($(JAVA_HAS_ZERO_VM),y) +$(eval $(call gb_Module_add_subsequentcheck_targets,odk, \ $(if $(ENABLE_JAVA),\ CustomTarget_build-examples_java \ ) \ )) endif +endif # vim: set noet sw=4 ts=4: -- 2.30.2